From 71bb1bebc0174f95f2cafd632ec3c5a91e996d20 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 26 Apr 2016 16:27:32 +0800 Subject: [PATCH] Visual Studio builds: Generate .pc files Generate .pc files for the package, so that it would be easier for building introspection for packages that depend on GTK+. Also split PythonPath into PythonPath and PythonPathX64 to facilitate the build of introspection files, which need to have Python that is built with the same ac=rchitecture where GTK+ is built. Clean up the formatting and spacing a bit. --- build/win32/Makefile.am | 2 + build/win32/gtkpc.py | 97 ++++++++++++++++ build/win32/pc_base.py | 108 ++++++++++++++++++ build/win32/replace.py | 13 ++- build/win32/vs10/Makefile.am | 2 + build/win32/vs10/gtk-3.vcxprojin | 4 +- build/win32/vs10/gtk3-gen-srcs.props | 37 ++---- build/win32/vs10/gtk3-install.propsin | 21 +++- build/win32/vs10/gtk3-install.vcxproj | 50 ++++++-- build/win32/vs10/gtk3-install.vcxproj.filters | 13 +++ .../win32/vs10/gtk3-prebuild.vcxproj.filters | 15 +++ build/win32/vs10/gtk3-version-paths.props.in | 6 +- build/win32/vs11/Makefile.am | 2 + build/win32/vs12/Makefile.am | 2 + build/win32/vs14/Makefile.am | 2 + build/win32/vs9/gtk-3.vcprojin | 4 +- build/win32/vs9/gtk3-gen-srcs.vsprops | 14 ++- build/win32/vs9/gtk3-install.vcproj | 80 +++++++++++-- build/win32/vs9/gtk3-install.vspropsin | 50 +++++--- build/win32/vs9/gtk3-version-paths.vsprops.in | 4 + 20 files changed, 447 insertions(+), 79 deletions(-) create mode 100644 build/win32/gtkpc.py create mode 100644 build/win32/pc_base.py create mode 100644 build/win32/vs10/gtk3-install.vcxproj.filters create mode 100644 build/win32/vs10/gtk3-prebuild.vcxproj.filters diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am index 138501846c..e1253dab6b 100644 --- a/build/win32/Makefile.am +++ b/build/win32/Makefile.am @@ -38,6 +38,8 @@ EXTRA_DIST += \ introspection-msvc.mak \ gtk-introspection-msvc.mak \ replace.py \ + pc_base.py \ + gtkpc.py \ $(GENERATED_ITEMS) -include $(top_srcdir)/git.mk diff --git a/build/win32/gtkpc.py b/build/win32/gtkpc.py new file mode 100644 index 0000000000..97a33c08b0 --- /dev/null +++ b/build/win32/gtkpc.py @@ -0,0 +1,97 @@ +#!/usr/bin/python +# +# Utility script to generate .pc files for GTK+ +# for Visual Studio builds, to be used for +# building introspection files + +# Author: Fan, Chun-wei +# Date: April 26, 2016 + +import os +import sys +import argparse + +from replace import replace_multi, replace +from pc_base import BasePCItems + +def main(argv): + base_pc = BasePCItems() + + gdk_parser = argparse.ArgumentParser(description='Setup basic .pc file info') + gdk_parser.add_argument('--broadway', + action='store_const', + const=1, + help='GDK with Broadway backend') + gdk_parser.add_argument('--host', + required=True, + help='Build type') + base_pc.setup(argv, gdk_parser) + + atk_min_ver = '2.15.1' + cairo_min_ver = '1.14.0' + gdk_pixbuf_min_ver = '2.30.0' + gdk_win32_sys_libs = '-lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid -lwinmm -ldwmapi' + glib_min_ver = '2.45.8' + + cairo_backends = 'cairo-win32' + gdk_backends = 'win32' + gio_package = 'gio-2.0 >= ' + glib_min_ver + broadway_extra_libs = '' + + gdk_args = gdk_parser.parse_args() + if getattr(gdk_args, 'broadway', None) is 1: + # On Visual Studio, we link to zlib1.lib + broadway_extra_libs = '-lzlib1' + gdk_backends += ' broadway' + cairo_backends += ' cairo' + + pkg_replace_items = {'@GTK_API_VERSION@': '3.0', + '@GDK_BACKENDS@': gdk_backends} + + pkg_required_packages = 'gdk-pixbuf >= ' + gdk_pixbuf_min_ver + ' ' + \ + 'cairo >= ' + cairo_min_ver + ' ' + \ + 'cairo-gobject >= ' + cairo_min_ver + + gdk_pc_replace_items = {'@GDK_PACKAGES@': gio_package + ' ' + \ + 'pangowin32 pangocairo' + ' ' + \ + pkg_required_packages, + '@GDK_PRIVATE_PACKAGES@': gio_package + ' ' + cairo_backends, + '@GDK_EXTRA_LIBS@': gdk_win32_sys_libs + broadway_extra_libs, + '@GDK_EXTRA_CFLAGS@': '', + 'gdk-3': 'gdk-3.0'} + + gtk_pc_replace_items = {'@host@': gdk_args.host, + '@GTK_BINARY_VERSION@': '3.0.0', + '@GTK_PACKAGES@': 'atk >= ' + atk_min_ver + ' ' + \ + pkg_required_packages + ' ' + \ + gio_package, + '@GTK_PRIVATE_PACKAGES@': 'atk', + '@GTK_EXTRA_CFLAGS@': '', + '@GTK_EXTRA_LIBS@': '', + '@GTK_EXTRA_CFLAGS@': '', + 'gtk-3': 'gtk-3.0'} + + gail_pc_replace_items = {'gailutil-3': 'gailutil-3.0'} + + pkg_replace_items.update(base_pc.base_replace_items) + gdk_pc_replace_items.update(pkg_replace_items) + gtk_pc_replace_items.update(pkg_replace_items) + gail_pc_replace_items.update(base_pc.base_replace_items) + + # Generate gdk-3.0.pc + replace_multi(base_pc.top_srcdir + '/gdk-3.0.pc.in', + base_pc.srcdir + '/gdk-3.0.pc', + gdk_pc_replace_items) + + # Generate gtk+-3.0.pc + replace_multi(base_pc.top_srcdir + '/gtk+-3.0.pc.in', + base_pc.srcdir + '/gtk+-3.0.pc', + gtk_pc_replace_items) + + # Generate gail-3.0.pc + replace_multi(base_pc.top_srcdir + '/gail-3.0.pc.in', + base_pc.srcdir + '/gail-3.0.pc', + gail_pc_replace_items) + +if __name__ == '__main__': + sys.exit(main(sys.argv)) diff --git a/build/win32/pc_base.py b/build/win32/pc_base.py new file mode 100644 index 0000000000..da10560a28 --- /dev/null +++ b/build/win32/pc_base.py @@ -0,0 +1,108 @@ +#!/usr/bin/python +# +# Simple utility script to generate the basic info +# needed in a .pc (pkg-config) file, used especially +# for introspection purposes + +# This can be used in various projects where +# there is the need to generate .pc files, +# and is copied from GLib's $(srcroot)/build/win32 + +# Author: Fan, Chun-wei +# Date: March 10, 2016 + +import os +import sys +import argparse + +class BasePCItems: + def __init__(self): + self.base_replace_items = {} + self.exec_prefix = '' + self.includedir = '' + self.libdir = '' + self.prefix = '' + self.srcdir = os.path.dirname(__file__) + self.top_srcdir = self.srcdir + '\\..\\..' + self.version = '' + + def setup(self, argv, parser=None): + if parser is None: + parser = argparse.ArgumentParser(description='Setup basic .pc file info') + parser.add_argument('--prefix', help='prefix of the installed library', + required=True) + parser.add_argument('--exec-prefix', + help='prefix of the installed programs, \ + if different from the prefix') + parser.add_argument('--includedir', + help='includedir of the installed library, \ + if different from ${prefix}/include') + parser.add_argument('--libdir', + help='libdir of the installed library, \ + if different from ${prefix}/lib') + parser.add_argument('--version', help='Version of the package', + required=True) + args = parser.parse_args() + + self.version = args.version + + # check whether the prefix and exec_prefix are valid + if not os.path.exists(args.prefix): + raise SystemExit('Specified prefix \'%s\' is invalid' % args.prefix) + + # check and setup the exec_prefix + if getattr(args, 'exec_prefix', None) is None: + input_exec_prefix = args.prefix + else: + input_exec_prefix = args.exec_prefix + if not os.path.exists(input_exec_prefix): + raise SystemExit('Specified exec-prefix \'%s\' is invalid' % + input_exec_prefix) + + + # check and setup the includedir + if getattr(args, 'includedir', None) is None: + self.includedir = '${prefix}/include' + else: + if args.includedir.startswith('${prefix}'): + includedir_use_shorthand = True + input_includedir = args.prefix + args.includedir[len('${prefix}'):] + else: + includedir_use_shorthand = False + input_includedir = args.includedir + if not os.path.exists(input_includedir): + raise SystemExit('Specified includedir \'%s\' is invalid' % + args.includedir) + if includedir_use_shorthand is True: + self.includedir = args.includedir.replace('\\','/') + else: + self.includedir = os.path.abspath(input_includedir).replace('\\','/') + + # check and setup the libdir + if getattr(args, 'libdir', None) is None: + self.libdir = '${prefix}/lib' + else: + if args.libdir.startswith('${prefix}'): + libdir_use_shorthand = True + input_libdir = args.prefix + args.libdir[len('${prefix}'):] + else: + libdir_use_shorthand = False + input_libdir = args.libdir + if not os.path.exists(input_libdir): + raise SystemExit('Specified libdir \'%s\' is invalid' % + args.libdir) + if libdir_use_shorthand is True: + self.libdir = args.libdir.replace('\\','/') + else: + self.libdir = os.path.abspath(input_libdir).replace('\\','/') + + # use absolute paths for prefix and exec_prefix + self.prefix = os.path.abspath(args.prefix).replace('\\','/') + self.exec_prefix = os.path.abspath(input_exec_prefix).replace('\\','/') + + # setup dictionary for replacing items in *.pc.in + self.base_replace_items.update({'@VERSION@': self.version}) + self.base_replace_items.update({'@prefix@': self.prefix}) + self.base_replace_items.update({'@exec_prefix@': self.exec_prefix}) + self.base_replace_items.update({'@libdir@': self.libdir}) + self.base_replace_items.update({'@includedir@': self.includedir}) diff --git a/build/win32/replace.py b/build/win32/replace.py index 69ef417a29..a81bab9426 100644 --- a/build/win32/replace.py +++ b/build/win32/replace.py @@ -21,12 +21,19 @@ valid_actions = ['remove-prefix', 'replace-str', 'remove-str'] -def replace(src, dest, instring, outstring): +def replace_multi(src, dest, replace_items): with open(src, 'r') as s: with open(dest, 'w') as d: for line in s: - i = line.replace(instring, outstring) - d.write(i) + replace_dict = dict((re.escape(key), value) \ + for key, value in replace_items.items()) + replace_pattern = re.compile("|".join(replace_dict.keys())) + d.write(replace_pattern.sub(lambda m: \ + replace_dict[re.escape(m.group(0))], line)) + +def replace(src, dest, instring, outstring): + replace_item = {instring: outstring} + replace_multi(src, dest, replace_item) def check_required_args(args, params): for param in params: diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index 5f6dd6dd7c..5358f969fb 100644 --- a/build/win32/vs10/Makefile.am +++ b/build/win32/vs10/Makefile.am @@ -33,6 +33,7 @@ EXTRA_DIST += \ README.txt \ gtk+.sln \ gtk3-prebuild.vcxproj \ + gtk3-prebuild.vcxproj.filters \ gdk3-win32.vcxprojin \ gdk3-win32.vcxproj.filtersin \ gdk3-broadway.vcxprojin \ @@ -60,6 +61,7 @@ EXTRA_DIST += \ gailutil-3.vcxprojin \ gailutil-3.vcxproj.filtersin \ gtk3-install.vcxproj \ + gtk3-install.vcxproj.filters \ gtk3-build-defines.props \ gtk3-copy-gdk-broadway.props \ gtk3-gen-srcs.props \ diff --git a/build/win32/vs10/gtk-3.vcxprojin b/build/win32/vs10/gtk-3.vcxprojin index f159c5e841..c1c6c6b1ac 100644 --- a/build/win32/vs10/gtk-3.vcxprojin +++ b/build/win32/vs10/gtk-3.vcxprojin @@ -168,13 +168,13 @@ $(GenerateGtkDbusBuiltSources) ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs) Generating GTK+ DBus Sources... - $(GenerateGtkDbusBuiltSources) + $(GenerateGtkDbusBuiltSourcesX64) ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs) Generating GTK+ DBus Sources... $(GenerateGtkDbusBuiltSources) ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs) Generating GTK+ DBus Sources... - $(GenerateGtkDbusBuiltSources) + $(GenerateGtkDbusBuiltSourcesX64) ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs) diff --git a/build/win32/vs10/gtk3-gen-srcs.props b/build/win32/vs10/gtk3-gen-srcs.props index b9440c83b6..e5e9c021b9 100644 --- a/build/win32/vs10/gtk3-gen-srcs.props +++ b/build/win32/vs10/gtk3-gen-srcs.props @@ -4,30 +4,19 @@ - -copy ..\..\..\config.h.win32 ..\..\..\config.h - + copy ..\..\..\config.h.win32 ..\..\..\config.h if exist ..\..\..\MSVC_$(Configuration) goto DONE_GDKCONFIG_H if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h - if exist ..\..\..\GDK_BROADWAY_BUILD del ..\..\..\GDK_BROADWAY_BUILD - if exist ..\..\..\MSVC_$(Configuration)_Broadway del ..\..\..\MSVC_$(Configuration)_Broadway - if exist $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll del $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll - if exist $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib del $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib - if "$(Configuration)" == "Release" del ..\..\..\MSVC_Debug - if "$(Configuration)" == "Debug" del ..\..\..\MSVC_Release - copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h - copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\GDK_WIN32ONLY_BUILD - echo $(Configuration) > ..\..\..\MSVC_$(Configuration) :DONE_GDKCONFIG_H @@ -35,35 +24,23 @@ echo $(Configuration) > ..\..\..\MSVC_$(Configuration) if exist ..\..\..\MSVC_$(Configuration)_Broadway goto DONE_GDKCONFIG_H - if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h - if exist ..\..\..\GDK_WIN32ONLY_BUILD del ..\..\..\GDK_WIN32ONLY_BUILD - if exist ..\..\..\MSVC_Release del ..\..\..\MSVC_Release - if exist ..\..\..\MSVC_Debug del ..\..\..\MSVC_Debug - if "$(Configuration)" == "Release_Broadway" del ..\..\..\MSVC_Debug_Broadway - if "$(Configuration)" == "Debug_Broadway" del ..\..\..\MSVC_Release_Broadway copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\gdk\gdkconfig.h - copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\GDK_BROADWAY_BUILD - echo $(Configuration) > ..\..\..\MSVC_$(Configuration)_Broadway :DONE_GDKCONFIG_H - -cd ..\..\..\gtk - -$(PythonPath)\python $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml - -cd $(SolutionDir) - + $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml + cd ..\..\..\gtk & $(PythonPath)\python $(GDbusCodeGenCmd) & cd $(SolutionDir) + cd ..\..\..\gtk & $(PythonPathX64)\python $(GDbusCodeGenCmd) & cd $(SolutionDir) copy ..\..\..\gtk\gtk-win32.rc.body ..\..\..\gtk\gtk-win32.rc $(PythonPath)\python ..\replace.py --action=replace-var --input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=* copy ..\..\..\demos\gtk-demo\demos.h.win32 ..\..\..\demos\gtk-demo\demos.h @@ -81,9 +58,15 @@ cd $(SolutionDir) $(GenGdkConfigHBroadway) + + $(GDbusCodeGenCmd) + $(GenerateGtkDbusBuiltSources) + + $(GenerateGtkDbusBuiltSourcesX64) + $(CopyGtkWin32RC) diff --git a/build/win32/vs10/gtk3-install.propsin b/build/win32/vs10/gtk3-install.propsin index feb5724468..491375647f 100644 --- a/build/win32/vs10/gtk3-install.propsin +++ b/build/win32/vs10/gtk3-install.propsin @@ -5,12 +5,9 @@ $(SolutionDir)$(Configuration)\$(Platform)\bin - $(BinDir)\$(GtkDllPrefix)gdk(GtkDllSuffix).dll;$(BinDir)\$(GtkDllPrefix)gtk(GtkDllSuffix).dll;$(BinDir)\$(GtkDllPrefix)gailutil(GtkDllSuffix).dll - $(BinDir)\gtk3-demo.exe;$(BinDir)\gtk3-demo-application.exe;$(BinDir)\gtk3-icon-browser.exe;$(BinDir)\gtk-encode-symbolic-svg.exe - $(BinDir)\broadwayd.exe mkdir $(CopyDir)\bin -mkdir $(CopyDir)\lib +mkdir $(CopyDir)\lib\pkgconfig copy "$(BinDir)\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).dll" $(CopyDir)\bin copy "$(BinDir)\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).pdb" $(CopyDir)\bin @@ -93,6 +90,10 @@ copy .\Debug\$(Platform)\bin\gtk-builder-tool.exe $(CopyDir)\bin copy .\Debug\$(Platform)\bin\gtk-builder-tool.pdb $(CopyDir)\bin :DONE_BIN + +copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig +copy "..\gtk+-3.0.pc" $(CopyDir)\lib\pkgconfig +copy ..\gail-3.0.pc $(CopyDir)\lib\pkgconfig echo off @@ -138,6 +139,9 @@ copy ..\..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gd mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway #include "gdk3-broadway.vs10.headers" + $(PythonPath)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=i686-pc-vs$(VSVer) + $(PythonPathX64)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=x86_64-pc-vs$(VSVer) + ..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc <_PropertySheetDisplayName>gtk3installsprops @@ -164,5 +168,14 @@ mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway $(GtkDoInstallBroadwayHeaders) + + $(GenerateGtkPC) + + + $(GenerateGtkPCX64) + + + $(GtkPCFiles) + diff --git a/build/win32/vs10/gtk3-install.vcxproj b/build/win32/vs10/gtk3-install.vcxproj index f87ad9baa6..cb772eb1f3 100644 --- a/build/win32/vs10/gtk3-install.vcxproj +++ b/build/win32/vs10/gtk3-install.vcxproj @@ -157,29 +157,63 @@ Installing Build Results... + $(GtkPCFiles) $(GtkDoInstallBin)$(GtkDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) + blah;%(Outputs) Installing Build Results... + $(GtkPCFiles) $(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders) - $(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs) + blah;%(Outputs) Installing Build Results... + $(GtkPCFiles) $(GtkDoInstallBin)$(GtkDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) + blah;%(Outputs) Installing Build Results... + $(GtkPCFiles) $(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders) - $(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs) + blah;%(Outputs) Installing Build Results... + $(GtkPCFiles) $(GtkDoInstallBin)$(GtkDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) + blah;%(Outputs) Installing Build Results... + $(GtkPCFiles) $(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders) - $(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs) + blah;%(Outputs) Installing Build Results... + $(GtkPCFiles) $(GtkDoInstallBin)$(GtkDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) + blah;%(Outputs) Installing Build Results... + $(GtkPCFiles) $(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders) - $(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs) + blah;%(Outputs) + + + Generating .pc files... + $(GenerateGtkPC) + $(GtkPCFiles);%(Outputs) + Generating .pc files... + $(GenerateGtkPC) --broadway + $(GtkPCFiles);%(Outputs) + Generating .pc files... + $(GenerateGtkPCX64) + $(GtkPCFiles);%(Outputs) + Generating .pc files... + $(GenerateGtkPCX64) --broadway + $(GtkPCFiles);%(Outputs) + Generating .pc files... + $(GenerateGtkPC) + $(GtkPCFiles);%(Outputs) + Generating .pc files... + $(GenerateGtkPC) --broadway + $(GtkPCFiles);%(Outputs) + Generating .pc files... + $(GenerateGtkPCX64) + $(GtkPCFiles);%(Outputs) + Generating .pc files... + $(GenerateGtkPCX64) --broadway + $(GtkPCFiles);%(Outputs) diff --git a/build/win32/vs10/gtk3-install.vcxproj.filters b/build/win32/vs10/gtk3-install.vcxproj.filters new file mode 100644 index 0000000000..c75e9b3cc0 --- /dev/null +++ b/build/win32/vs10/gtk3-install.vcxproj.filters @@ -0,0 +1,13 @@ + + + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + Resource Files + Resource Files + + diff --git a/build/win32/vs10/gtk3-prebuild.vcxproj.filters b/build/win32/vs10/gtk3-prebuild.vcxproj.filters new file mode 100644 index 0000000000..f97b21d08b --- /dev/null +++ b/build/win32/vs10/gtk3-prebuild.vcxproj.filters @@ -0,0 +1,15 @@ + + + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + Resource Files + Resource Files + Resource Files + Resource Files + + diff --git a/build/win32/vs10/gtk3-version-paths.props.in b/build/win32/vs10/gtk3-version-paths.props.in index 83a58f3a33..8c3e3d6585 100644 --- a/build/win32/vs10/gtk3-version-paths.props.in +++ b/build/win32/vs10/gtk3-version-paths.props.in @@ -12,7 +12,8 @@ -vs$(VSVer) $(GtkSeparateVSDllPrefix) $(GtkSeparateVSDllSuffix) - c:\python27 + c:\python34 + $(PythonPath).x64 <_PropertySheetDisplayName>gtk3versionpathsprops @@ -54,5 +55,8 @@ $(PythonPath) + + $(PythonPathX64) + diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am index 8eb2e9910c..3ced683539 100644 --- a/build/win32/vs11/Makefile.am +++ b/build/win32/vs11/Makefile.am @@ -4,6 +4,7 @@ EXTRA_DIST += \ README.txt \ gtk+.sln \ gtk3-prebuild.vcxproj \ + gtk3-prebuild.vcxproj.filters \ gdk3-win32.vcxproj \ gdk3-win32.vcxproj.filters \ gdk-3.vcxproj \ @@ -27,6 +28,7 @@ EXTRA_DIST += \ gailutil-3.vcxproj \ gailutil-3.vcxproj.filters \ gtk3-install.vcxproj \ + gtk3-install.vcxproj.filters \ broadwayd.vcxproj \ broadwayd.vcxproj.filters \ gdk3-broadway.vcxproj \ diff --git a/build/win32/vs12/Makefile.am b/build/win32/vs12/Makefile.am index 6c124b64c5..766ccd69f5 100644 --- a/build/win32/vs12/Makefile.am +++ b/build/win32/vs12/Makefile.am @@ -4,6 +4,7 @@ EXTRA_DIST += \ README.txt \ gtk+.sln \ gtk3-prebuild.vcxproj \ + gtk3-prebuild.vcxproj.filters \ gdk3-win32.vcxproj \ gdk3-win32.vcxproj.filters \ gdk-3.vcxproj \ @@ -27,6 +28,7 @@ EXTRA_DIST += \ gailutil-3.vcxproj \ gailutil-3.vcxproj.filters \ gtk3-install.vcxproj \ + gtk3-install.vcxproj.filters \ broadwayd.vcxproj \ broadwayd.vcxproj.filters \ gdk3-broadway.vcxproj \ diff --git a/build/win32/vs14/Makefile.am b/build/win32/vs14/Makefile.am index 0192eb4fac..dfa6c328e2 100644 --- a/build/win32/vs14/Makefile.am +++ b/build/win32/vs14/Makefile.am @@ -4,6 +4,7 @@ EXTRA_DIST += \ README.txt \ gtk+.sln \ gtk3-prebuild.vcxproj \ + gtk3-prebuild.vcxproj.filters \ gdk3-win32.vcxproj \ gdk3-win32.vcxproj.filters \ gdk-3.vcxproj \ @@ -27,6 +28,7 @@ EXTRA_DIST += \ gailutil-3.vcxproj \ gailutil-3.vcxproj.filters \ gtk3-install.vcxproj \ + gtk3-install.vcxproj.filters \ broadwayd.vcxproj \ broadwayd.vcxproj.filters \ gdk3-broadway.vcxproj \ diff --git a/build/win32/vs9/gtk-3.vcprojin b/build/win32/vs9/gtk-3.vcprojin index b2dd357b6d..94c6c7ea7f 100644 --- a/build/win32/vs9/gtk-3.vcprojin +++ b/build/win32/vs9/gtk-3.vcprojin @@ -180,14 +180,14 @@ diff --git a/build/win32/vs9/gtk3-gen-srcs.vsprops b/build/win32/vs9/gtk3-gen-srcs.vsprops index 88bb9826f2..c221fc4e04 100644 --- a/build/win32/vs9/gtk3-gen-srcs.vsprops +++ b/build/win32/vs9/gtk3-gen-srcs.vsprops @@ -54,13 +54,17 @@ echo $(ConfigurationName) > ..\..\..\MSVC_$(ConfigurationName)_Broadway :DONE_GDKCONFIG_H " /> + + @@ -41,7 +41,7 @@ DeleteExtensionsOnClean="" > @@ -55,7 +55,7 @@ DeleteExtensionsOnClean="" > @@ -68,7 +68,7 @@ DeleteExtensionsOnClean="" > @@ -83,7 +83,7 @@ WholeProgramOptimization="1" > @@ -97,7 +97,7 @@ WholeProgramOptimization="1" > @@ -112,7 +112,7 @@ WholeProgramOptimization="1" > @@ -126,7 +126,7 @@ WholeProgramOptimization="1" > @@ -134,6 +134,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/gtk3-install.vspropsin b/build/win32/vs9/gtk3-install.vspropsin index d3e46c0c58..883d06ed96 100644 --- a/build/win32/vs9/gtk3-install.vspropsin +++ b/build/win32/vs9/gtk3-install.vspropsin @@ -1,15 +1,15 @@ - + - + - + /> + + diff --git a/build/win32/vs9/gtk3-version-paths.vsprops.in b/build/win32/vs9/gtk3-version-paths.vsprops.in index 2e813da97c..7d031c95d9 100644 --- a/build/win32/vs9/gtk3-version-paths.vsprops.in +++ b/build/win32/vs9/gtk3-version-paths.vsprops.in @@ -54,4 +54,8 @@ Name="PythonPath" Value="c:\python27" /> + -- 2.30.2